From 39f0bd47ddef860a66f46d7879f5ca342b35b3dc Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 7 Aug 2014 21:59:27 -0700 Subject: [PATCH] Register new snapshots --- src/cargo/ops/cargo_rustc/layout.rs | 68 +++++++++++++++-------------- src/snapshots.txt | 7 +++ 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/src/cargo/ops/cargo_rustc/layout.rs b/src/cargo/ops/cargo_rustc/layout.rs index b02fb0744..fdca3fec5 100644 --- a/src/cargo/ops/cargo_rustc/layout.rs +++ b/src/cargo/ops/cargo_rustc/layout.rs @@ -3,46 +3,48 @@ //! The directory layout is a little tricky at times, hence a separate file to //! house this logic. The current layout looks like this: //! -//! # This is the root directory for all output, the top-level package -//! # places all of its output here. -//! target/ +//! ```ignore +//! # This is the root directory for all output, the top-level package +//! # places all of its output here. +//! target/ //! -//! # This is the root directory for all output of *dependencies* -//! deps/ +//! # This is the root directory for all output of *dependencies* +//! deps/ //! -//! # This is the location at which the output of all custom build -//! # commands are rooted -//! native/ +//! # This is the location at which the output of all custom build +//! # commands are rooted +//! native/ //! -//! # Each package gets its own directory for where its output is -//! # placed. We can't track exactly what's getting put in here, so -//! # we just assume that all relevant output is in these -//! # directories. -//! $pkg1/ -//! $pkg2/ -//! $pkg3/ +//! # Each package gets its own directory for where its output is +//! # placed. We can't track exactly what's getting put in here, so +//! # we just assume that all relevant output is in these +//! # directories. +//! $pkg1/ +//! $pkg2/ +//! $pkg3/ //! -//! # Hidden directory that holds all of the fingerprint files for all -//! # packages -//! .fingerprint/ +//! # Hidden directory that holds all of the fingerprint files for all +//! # packages +//! .fingerprint/ //! -//! # This is a temporary directory as part of the build process. When a -//! # build starts, it initially moves the old `deps` directory to this -//! # location. This is done to ensure that there are no stale artifacts -//! # lying around in the build directory which may cause a build to -//! # succeed where it would fail elsewhere. -//! # -//! # If a package is determined to be fresh, its files are moved out of -//! # this directory and back into `deps`. -//! old-deps/ +//! # This is a temporary directory as part of the build process. When a +//! # build starts, it initially moves the old `deps` directory to this +//! # location. This is done to ensure that there are no stale artifacts +//! # lying around in the build directory which may cause a build to +//! # succeed where it would fail elsewhere. +//! # +//! # If a package is determined to be fresh, its files are moved out of +//! # this directory and back into `deps`. +//! old-deps/ //! -//! # Similar to old-deps, this is where all of the output under -//! # `target/` is moved at the start of a build. -//! old-root/ +//! # Similar to old-deps, this is where all of the output under +//! # `target/` is moved at the start of a build. +//! old-root/ //! -//! # Same as the two above old directories -//! old-native/ -//! old-fingerprint/ +//! # Same as the two above old directories +//! old-native/ +//! old-fingerprint/ +//! ``` use std::io; use std::io::{fs, IoResult}; diff --git a/src/snapshots.txt b/src/snapshots.txt index 29dbc9b87..bc6e10ee4 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,10 @@ +2014-08-08 + linux-i386 44207002e96c4f1309af70673966ee1e67938f5e + linux-x86_64 5dc5e5aa575814af2d4e40e9dcdca2c55b594bd1 + macos-i386 5d1924057a0d56d033f32680f4b393cdd9c6805a + macos-x86_64 65462ea1e48cb4b4c57ff7e947cd2cc26a8f2723 + winnt-i386 a481b15d35ab2e1d1dcd2f181a2566e097604ffc + 2014-08-06 linux-i386 eb7c2a87b30db077f6f1c4ea724ebd0e5cc07d1c linux-x86_64 1672657adb9012df2912bbb2f43466f1c6817e55 -- 2.30.2